package git;


public class File1 {

    //模拟情况：orgin master 修改了File1,而本地修改了File2
	
	//本地使用git fetch and git merge

    //试用 git fetch and git merger

}
